From 4812ddabfb548e489c210cc37584e017c105a2ad Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Wed, 22 Mar 2017 08:31:14 +0000 Subject: [PATCH] force-use-luajit-system-proxy Gbp-Pq: Name 0004-force-use-luajit-system-proxy.patch --- proxy/Makefile.am | 80 +--------------- proxy/Makefile.in | 94 ++----------------- proxy/api/ts/Makefile.in | 6 +- proxy/config/Makefile.in | 6 +- proxy/config/body_factory/Makefile.in | 6 +- proxy/config/body_factory/default/Makefile.in | 6 +- proxy/congest/Makefile.in | 6 +- proxy/hdrs/Makefile.in | 6 +- proxy/http/Makefile.in | 6 +- proxy/http/remap/Makefile.in | 6 +- proxy/http2/Makefile.in | 6 +- proxy/logging/Makefile.am | 4 +- proxy/logging/Makefile.in | 10 +- proxy/shared/Makefile.in | 6 +- 14 files changed, 51 insertions(+), 197 deletions(-) diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 4469207f..d57e15c1 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -48,7 +48,7 @@ AM_CPPFLAGS = \ # NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start # building libtool archives, change these to only apply to the executables. AM_LDFLAGS = \ - $(LUAJIT_LDFLAGS) \ + $(LUA_LDFLAGS) \ @EXTRA_CXX_LDFLAGS@ \ @LIBTOOL_LINK_FLAGS@ \ @OPENSSL_LDFLAGS@ @@ -56,75 +56,6 @@ AM_LDFLAGS = \ noinst_HEADERS = \ Show.h -# These are currently built separate, as part of building the lib/ tree, using -# the normal LuaJIT build system. We are using the .o's directly, instead of the -# luajit.a to avoid the linker from optimizing symbols away. We could maybe -# switch to using the luajit.so, but that involves making sure it installs safely -# and cleanly. -LUAJIT = \ - lib_aux.o \ - lib_base.o \ - lib_bit.o \ - lib_debug.o \ - lib_ffi.o \ - lib_init.o \ - lib_io.o \ - lib_jit.o \ - lib_math.o \ - lib_os.o \ - lib_package.o \ - lib_string.o \ - lib_table.o \ - lj_alloc.o \ - lj_api.o \ - lj_asm.o \ - lj_bc.o \ - lj_bcread.o \ - lj_bcwrite.o \ - lj_carith.o \ - lj_ccall.o \ - lj_ccallback.o \ - lj_cconv.o \ - lj_cdata.o \ - lj_char.o \ - lj_clib.o \ - lj_cparse.o \ - lj_crecord.o \ - lj_ctype.o \ - lj_debug.o \ - lj_dispatch.o \ - lj_err.o \ - lj_ffrecord.o \ - lj_func.o \ - lj_gc.o \ - lj_gdbjit.o \ - lj_ir.o \ - lj_lex.o \ - lj_lib.o \ - lj_load.o \ - lj_mcode.o \ - lj_meta.o \ - lj_obj.o \ - lj_opt_dce.o \ - lj_opt_fold.o \ - lj_opt_loop.o \ - lj_opt_mem.o \ - lj_opt_narrow.o \ - lj_opt_sink.o \ - lj_opt_split.o \ - lj_parse.o \ - lj_record.o \ - lj_snap.o \ - lj_state.o \ - lj_str.o \ - lj_strscan.o \ - lj_tab.o \ - lj_trace.o \ - lj_udata.o \ - lj_vm.o \ - lj_vmevent.o \ - lj_vmmath.o - EXTRA_DIST = InkAPITestTool.cc example_alarm_bin.sh example_prep.sh traffic_server_SOURCES = \ @@ -211,11 +142,11 @@ traffic_server_LDADD = \ $(top_builddir)/iocore/aio/libinkaio.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a \ $(top_builddir)/iocore/net/libinknet.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ + $(LUA_LIBS) \ @HWLOC_LIBS@ \ @LIBPCRE@ \ @LIBTCL@ \ @@ -227,7 +158,6 @@ traffic_server_LDADD = \ @OPENSSL_LIBS@ \ -lm -traffic_server_LDADD += $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%) traffic_logcat_SOURCES = logcat.cc traffic_logcat_LDADD = \ @@ -239,9 +169,8 @@ traffic_logcat_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a \ @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@\ - @LIBPROFILER@ -lm + @LIBPROFILER@ $(LUA_LIBS) -lm traffic_logstats_SOURCES = logstats.cc traffic_logstats_LDADD = \ @@ -253,9 +182,8 @@ traffic_logstats_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a \ @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@ \ - @LIBPROFILER@ -lm + @LIBPROFILER@ $(LUA_LIBS) -lm versiondir = $(pkgsysconfdir) diff --git a/proxy/Makefile.in b/proxy/Makefile.in index 9efdfbc5..2be89582 100644 --- a/proxy/Makefile.in +++ b/proxy/Makefile.in @@ -168,8 +168,7 @@ traffic_logcat_DEPENDENCIES = logging/liblogging.a \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ - $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a + $(top_builddir)/lib/bindings/libbindings.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -182,8 +181,7 @@ traffic_logstats_DEPENDENCIES = logging/liblogging.a \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ - $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a + $(top_builddir)/lib/bindings/libbindings.la am__traffic_server_SOURCES_DIST = AbstractBuffer.cc AbstractBuffer.h \ CacheControl.cc CacheControl.h ControlBase.cc ControlBase.h \ ControlMatcher.cc ControlMatcher.h CoreUtils.cc CoreUtils.h \ @@ -230,12 +228,10 @@ traffic_server_DEPENDENCIES = http/libhttp.a http2/libhttp2.a \ $(top_builddir)/iocore/aio/libinkaio.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/lib/bindings/libbindings.la \ - $(top_builddir)/lib/luajit/src/libluajit.a \ $(top_builddir)/iocore/net/libinknet.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/records/librecords_p.a \ - $(top_builddir)/iocore/eventsystem/libinkevent.a \ - $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%) + $(top_builddir)/iocore/eventsystem/libinkevent.a traffic_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(traffic_server_LDFLAGS) \ @@ -661,9 +657,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -969,7 +965,7 @@ AM_CPPFLAGS = \ # NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start # building libtool archives, change these to only apply to the executables. AM_LDFLAGS = \ - $(LUAJIT_LDFLAGS) \ + $(LUA_LDFLAGS) \ @EXTRA_CXX_LDFLAGS@ \ @LIBTOOL_LINK_FLAGS@ \ @OPENSSL_LDFLAGS@ @@ -978,75 +974,6 @@ noinst_HEADERS = \ Show.h -# These are currently built separate, as part of building the lib/ tree, using -# the normal LuaJIT build system. We are using the .o's directly, instead of the -# luajit.a to avoid the linker from optimizing symbols away. We could maybe -# switch to using the luajit.so, but that involves making sure it installs safely -# and cleanly. -LUAJIT = \ - lib_aux.o \ - lib_base.o \ - lib_bit.o \ - lib_debug.o \ - lib_ffi.o \ - lib_init.o \ - lib_io.o \ - lib_jit.o \ - lib_math.o \ - lib_os.o \ - lib_package.o \ - lib_string.o \ - lib_table.o \ - lj_alloc.o \ - lj_api.o \ - lj_asm.o \ - lj_bc.o \ - lj_bcread.o \ - lj_bcwrite.o \ - lj_carith.o \ - lj_ccall.o \ - lj_ccallback.o \ - lj_cconv.o \ - lj_cdata.o \ - lj_char.o \ - lj_clib.o \ - lj_cparse.o \ - lj_crecord.o \ - lj_ctype.o \ - lj_debug.o \ - lj_dispatch.o \ - lj_err.o \ - lj_ffrecord.o \ - lj_func.o \ - lj_gc.o \ - lj_gdbjit.o \ - lj_ir.o \ - lj_lex.o \ - lj_lib.o \ - lj_load.o \ - lj_mcode.o \ - lj_meta.o \ - lj_obj.o \ - lj_opt_dce.o \ - lj_opt_fold.o \ - lj_opt_loop.o \ - lj_opt_mem.o \ - lj_opt_narrow.o \ - lj_opt_sink.o \ - lj_opt_split.o \ - lj_parse.o \ - lj_record.o \ - lj_snap.o \ - lj_state.o \ - lj_str.o \ - lj_strscan.o \ - lj_tab.o \ - lj_trace.o \ - lj_udata.o \ - lj_vm.o \ - lj_vmevent.o \ - lj_vmmath.o - EXTRA_DIST = InkAPITestTool.cc example_alarm_bin.sh example_prep.sh traffic_server_SOURCES = AbstractBuffer.cc AbstractBuffer.h \ CacheControl.cc CacheControl.h ControlBase.cc ControlBase.h \ @@ -1085,8 +1012,7 @@ traffic_server_LDADD = http/libhttp.a http2/libhttp2.a \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a @HWLOC_LIBS@ \ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @LIBRESOLV@ @LIBZ@ @LIBLZMA@ \ - @LIBPROFILER@ @OPENSSL_LIBS@ -lm \ - $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%) + @LIBPROFILER@ @OPENSSL_LIBS@ $(LUA_LIBS) -lm traffic_logcat_SOURCES = logcat.cc traffic_logcat_LDADD = \ logging/liblogging.a \ @@ -1099,7 +1025,7 @@ traffic_logcat_LDADD = \ $(top_builddir)/lib/bindings/libbindings.la \ $(top_builddir)/lib/luajit/src/libluajit.a \ @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@\ - @LIBPROFILER@ -lm + @LIBPROFILER@ $(LIBLUA_LIBS) -lm traffic_logstats_SOURCES = logstats.cc traffic_logstats_LDADD = \ @@ -1113,7 +1039,7 @@ traffic_logstats_LDADD = \ $(top_builddir)/lib/bindings/libbindings.la \ $(top_builddir)/lib/luajit/src/libluajit.a \ @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@ \ - @LIBPROFILER@ -lm + @LIBPROFILER@ $(LUA_LIBS) -lm versiondir = $(pkgsysconfdir) all: all-recursive diff --git a/proxy/api/ts/Makefile.in b/proxy/api/ts/Makefile.in index 021fec3c..5c796a1b 100644 --- a/proxy/api/ts/Makefile.in +++ b/proxy/api/ts/Makefile.in @@ -291,9 +291,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/config/Makefile.in b/proxy/config/Makefile.in index ac8772fe..85f82a27 100644 --- a/proxy/config/Makefile.in +++ b/proxy/config/Makefile.in @@ -335,9 +335,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/config/body_factory/Makefile.in b/proxy/config/body_factory/Makefile.in index 01724a34..71bc7529 100644 --- a/proxy/config/body_factory/Makefile.in +++ b/proxy/config/body_factory/Makefile.in @@ -303,9 +303,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/config/body_factory/default/Makefile.in b/proxy/config/body_factory/default/Makefile.in index f99d99ca..a2dc6e43 100644 --- a/proxy/config/body_factory/default/Makefile.in +++ b/proxy/config/body_factory/default/Makefile.in @@ -273,9 +273,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/congest/Makefile.in b/proxy/congest/Makefile.in index fa84776e..322de437 100644 --- a/proxy/congest/Makefile.in +++ b/proxy/congest/Makefile.in @@ -323,9 +323,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/hdrs/Makefile.in b/proxy/hdrs/Makefile.in index cc9b1d75..947f5709 100644 --- a/proxy/hdrs/Makefile.in +++ b/proxy/hdrs/Makefile.in @@ -572,9 +572,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/http/Makefile.in b/proxy/http/Makefile.in index d909c518..6acafeb9 100644 --- a/proxy/http/Makefile.in +++ b/proxy/http/Makefile.in @@ -405,9 +405,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/http/remap/Makefile.in b/proxy/http/remap/Makefile.in index fddd3ae6..3ee3af29 100644 --- a/proxy/http/remap/Makefile.in +++ b/proxy/http/remap/Makefile.in @@ -336,9 +336,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/http2/Makefile.in b/proxy/http2/Makefile.in index 7fd53803..ca03f12f 100644 --- a/proxy/http2/Makefile.in +++ b/proxy/http2/Makefile.in @@ -580,9 +580,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am index ea2c0d40..25618435 100644 --- a/proxy/logging/Makefile.am +++ b/proxy/logging/Makefile.am @@ -21,7 +21,6 @@ include $(top_srcdir)/build/tidy.mk AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/luajit/src \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/proxy \ @@ -30,7 +29,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/shared \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils + -I$(top_srcdir)/mgmt/utils \ + $(LUA_CPPFLAGS) EXTRA_DIST = LogStandalone.cc diff --git a/proxy/logging/Makefile.in b/proxy/logging/Makefile.in index 26a04f52..bb6147aa 100644 --- a/proxy/logging/Makefile.in +++ b/proxy/logging/Makefile.in @@ -557,9 +557,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -841,7 +841,6 @@ CC_Clang_Tidy = $(CLANG_TIDY) $(Clang_Tidy_Options) $(call Clang_Tidy_CC_Files,$ AM_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/luajit/src \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/proxy \ @@ -850,7 +849,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/shared \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils + -I$(top_srcdir)/mgmt/utils \ + $(LUA_CPPFLAGS) EXTRA_DIST = LogStandalone.cc noinst_LIBRARIES = liblogging.a liblogcollation.a diff --git a/proxy/shared/Makefile.in b/proxy/shared/Makefile.in index a8383fdd..2fe565b6 100644 --- a/proxy/shared/Makefile.in +++ b/proxy/shared/Makefile.in @@ -319,9 +319,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ -- 2.30.2